Use -O1 rather than -O2 on ia64 to fix a build failure.

Fix a build failure (looks like a broken byte compiler) with newer
versions of gcc (c.f. #207580). (closes: 582439)

diff --git a/debian/changelog b/debian/changelog
index 34e6a1049e2a7f1d517089bda7f9ab8dca6e3e18..c61435f9fea1aa4091ddb607a33c7be0fbb13c3e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,13 @@ emacs23 (23.2+1-3) unstable; urgency=low
 
   * Don't try to "mkdir $(infodir)" in doc/*/Makefile.in.
 
- -- Rob Browning <rlb@defaultvalue.org>  Mon, 09 Aug 2010 23:50:27 -0500
+  * Use -O1 rather than -O2 on ia64.  Fixes a build failure (looks
+    like a broken byte compiler) with newer versions of gcc
+    (c.f. #207580).  Thanks to Sven Joachim <svenjoac@gmx.de> for the
+    report and thanks to Stéphane Glondu <glondu@debian.org> for the
+    23.2+1-2.1 NMU. (closes: 582439)
+
+ -- Rob Browning <rlb@defaultvalue.org>  Tue, 10 Aug 2010 00:20:41 -0500
 
 emacs23 (23.2+1-2) unstable; urgency=low
 

diff --git a/debian/rules b/debian/rules
index dae9466862e64bb1ba9c91dd075df5a4fd6a2d83..9c66176e909febc705558bff2485e371ce774940 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -172,13 +172,14 @@ CFLAGS    := -DDEBIAN -g
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
   CFLAGS += -O0
 else # not noopt
-  ifeq (m68k,$(DEB_HOST_ARCH))
-    # fix problem with newer versions of gcc on m68k
-    # -O2 causes a build failure (broken byte compiler)
+  ifneq (,$(filter $(DEB_HOST_ARCH),m68k ia64))
+    # Fix a problem with newer versions of gcc on m68k and ia64.
+    # There -O2 causes a build failure (broken byte compiler) - see
+    # bugs #207580 and #582439.
     CFLAGS += -O1
-  else # neq (m68k,$(DEB_HOST_ARCH))
+  else # neq (m68k or ia64)
     CFLAGS += -O2
-  endif # neq (m68k,$(DEB_HOST_ARCH))
+  endif # neq (m68k or ia64)
 endif # not noopt
 
 joblimit := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))